Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 2388394f33

Change-Id: I97bd73eaaed7df31befb7ea2aedbec2ae50be355