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

Change-Id: I65288cb11d5b2a56bcf3e388f1bb4de6d3ee74dd