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

Change-Id: I577c1288a837cecc6e1057b0672de8ff0fcd344e