Manually merge changes from giant AOSP topic

Change-Id: I1ea6075bfd53d3ed1e64100ea2bf0e574f0193da