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

Change-Id: I14c19ec7b33669674a3d2219d5fe95b92559412f