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

Change-Id: Id7c3d9fa68097f48727b6bb5ad55c7233bdd2cbf