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

Change-Id: I77b02bbd1748e9f04feb51456567e0f509d32d77