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

Change-Id: I923831a9b8e03afd6839e8b0354c3c1e0f7731b7