Merge changes from topic "cherry-picks" am: a1c2f7f6c6
am: 8724a39616

Change-Id: Ib244051de36a9f52b425b3d4fac611f22b5390a2