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

Change-Id: I66ae9464f1a59748677ed7dc53fbe98ee8b4a934