Manually merge changes from giant AOSP topic

Change-Id: Ieeb510eef4932dd38218c8e4f14cfeabc9436339