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

Change-Id: I842b471a100e3da8b917a34059cb7bfe0248481c