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

Change-Id: Ieafa1d7163c3b586f9daa34a8b8239ea57db6636