Merge remote-tracking branch 'aosp/upstream-import' into upstream-staging

Change-Id: I959864c5b5531aca216b9965bf471e2c7b6e1025