Bug: 109667921 Bug: 112001603 Bug: 119570995 Bug: 123043629 Test: mma Change-Id: Icd4071de7ee4ef67797b91231843a5d98f1283a6 Merged-In: Icd4071de7ee4ef67797b91231843a5d98f1283a6 (cherry picked from commit c517ee62)