Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 8f4c3d668d

Change-Id: I2972f0f1a589d2ccb0946a5cce6d35af9d0582b5