Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I8238b2fdb20ecc7dc982b388ba5be19a8b7e4094