Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 58e57434aa
am: b307ff397b

Change-Id: If0c167ea3a19c3936457a34d413e4e00dd03419a