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

Change-Id: I4f78cdba8159cbb2b6f3181afbcdf5d13ddfd3dd