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

Change-Id: I888a0d89112441f4b7bbd7fed582646dc053bccd