Merge remote-tracking branch 'aosp/upstream-master' into aosp/master
am: f7ec9f65d4

Change-Id: Iec1436bc9d24a1daf209512b9cb77492030ddeab