Manually merge changes from giant AOSP topic

Change-Id: I4385ad154e40b1093efadd146a4a7d1266991dcc