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

Change-Id: I794baf04b9874aabf8bf69eaf53a56e313af18f1