Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 65f77e6c25

Change-Id: I3ea55fa0d328d45045091d9b4815ebd02e94c106