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

Change-Id: Ibbbe0f78811c394342330b3b14f91fee24e27d61