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

Change-Id: I6df47db349527401bd5e03b422e4ede162e64637