Manually merge changes from giant AOSP topic

Change-Id: Ibccf6983a3d30681752af36a369bcdf7325ac251