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

Change-Id: Ic4fc21de468744e47e3851c302398b2b82faaa1f