Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: a4843aaec0

Change-Id: I0462847f2e5bed2130ece4c1c729070189fd7849