Merge branch 'mirror-aosp-master' into stage-aosp-master

Change-Id: I62642295c523f8019b1dbc5c6c2bb30432b6ad83