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

Change-Id: Ied35e9eb1752ae6018f94d52860ddd6e94312b36