Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 8c5a46cb6e am: 3a6dd66b27 am: 619fae69f3
am: 3724b2b0b3

Change-Id: I5b44a1cf20cf828904a7a475ea9650777d35b74d