Manually merge changes from giant AOSP topic

Change-Id: I9d01e92ac13dcde939606dc6a1487953a0705d34