Fix: 317019325 Test: Visual Change-Id: Ib6c9a9eaf76716daabfcd0166954678ea770c4e9
Fix: 317019325 Test: Visual Change-Id: Idbb66adbe7773d85e87660a45822af9f01bc595c