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

Change-Id: I086e7b4db277dad8e1eef37ad78ed19623fe53a1