Merge "Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master" am: 2f199d6b35
am: c11fed47ea

Change-Id: I2f159cb23629ced81852661fedf7e311fca3ad19