Manually merge changes from giant AOSP topic

Change-Id: Ic7d1baf4b56d23db896185143faaa348756cd27c