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

Change-Id: Ia0cf4103322a2f7ad5c0a1ba0c33d8736fb5f7c3