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

Change-Id: Ie267492ab581f4fde888fd1cd068ae60a96683ca