Merge "Sync with upstream 41655e1c:" am: 78d19b2743 am: f0a696483b

Change-Id: I2ac793f4b4c0dcdfd1f29c17242800c4d9f37976