Manually merge changes from giant AOSP topic

Change-Id: Icdd078fce1349f3b01156296041b04860310198e