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

Test: N/A
Change-Id: I6d8ccaae3eae0f52ae47760923dc3669b374de2b