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

Change-Id: Ic4cbea667e161f0e70c896072a5516764ab7e2e6