Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 63fd9cc1fc am: 5ff310359f
am: cacad4c29a

Change-Id: Ibc8eff977b742730470a309036810a9f5dca702a