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

Change-Id: I1c6d8bd598c62c48fcd4e51c0459d148955f7bbd