Manually merge changes from giant AOSP topic

Change-Id: Ie4cb14562dba8071880c95481a68556633e02da5