Manually merge changes from giant AOSP topic

Change-Id: Ia7d49acf78f4ed462f749a2cc18d939e4ccf3dfe