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

Change-Id: I7695d2fd08a5c9723528a429b536b68089ceeb08