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

Change-Id: I08c5bfedc13baeba286f44375d54f83b2ca990ec