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

Change-Id: I421a32e3c40700b87f4dc8dce6b9aa0212da81a1