Manually merge changes from giant AOSP topic

Change-Id: Iae0f83ee9bfacb251a64bcd36f72573cbb3aab4d