Merge remote-tracking branch 'aosp/upstream-master' into HEAD

Populate the repository.

Change-Id: I519be6e2841e46b7dcc302dba5c53617342a259d