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

Change-Id: I6e5d4cba669dccac1af743d12944178ba7bbe036