Manually merge changes from giant AOSP topic

Change-Id: I6570f8e55cbba95308cc3d0fbea4bae11d5b85df