Manually merge changes from giant AOSP topic

Change-Id: I5923e659066f76f41b8a423bd718697b489a1926