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

Test: N/A
Change-Id: If6798c8d1ebce321a7f9d3586a5b63c37f90a0b1