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

Change-Id: I90b054ee0e69513771ee9f2a16f125d38b4e8618