Manually merge changes from giant AOSP topic

Change-Id: Ia96fdee9a12f5eedeadd05db1169937ae4b32556