Manually merge changes from giant AOSP topic

Change-Id: I2c361f075c420038ce9c0450fd4a9f2b2c52b71b