[automerger skipped] Merge changes from topic "CherryPickMainline" am: cd70c935b3 am: 024080998d am: ffb3818104 -s ours
am skip reason: Change-Id Ie0189ef3befff9f1e2da127a1f4cef69f8f7043e with SHA-1 48bba35dc1 is in history

Change-Id: Ia422d8ab8b76d1e9f9f3d72ec444f0f8d1640640