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

Change-Id: Idf2438fc3f4d4b6a03748e5a51c2be67019e191e