Manually merge changes from giant AOSP topic

Change-Id: Ib6b9f9ffff6a0aaec14789bacaa2e4cf59a3d0d1