Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: aa8a972ea3 am: 2ef76cb0d2
am: 17a1b4e1fc

Change-Id: Ia8ad6a2475329fca2431ef99a9b890c8ec5502e5