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

Change-Id: I89f6105143d3773405d02de9e5c4249c31fd83dc