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

Change-Id: I75e1d952071cbac3ad8aee7d9290ce4c20859b25