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

Change-Id: I3def6754a4ecd319aa63d196aa756d18490b4c19