Merge changes from topic "CherryPickMainline" am: cd70c935b3

Change-Id: I7587a8d1895b728a25a54a0b3a4303295b338e1f