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

Change-Id: I32a1226a6322f84abc89fb4e483038fad0cbe94c