Merge "Sync with upstream 643521d:" am: 3cddfb862c am: 6e892c28ab am: 3d011a1c9a
am: 888d4d2118

Change-Id: Idf22eba47a23ac0b6590683870a439e0de6788a7