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

Change-Id: If8a7c8df2e75d347eebb1a1b74782ffa314981a0