Manually merge changes from giant AOSP topic

Change-Id: Ie706753a6894f5175b2d00f376ab1966ed9eb4e3