Manually merge changes from giant AOSP topic

Change-Id: I85def09e451a21b8eecd0f023fcaf2d2151d5136