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

Change-Id: I0264e3758705a2676d061b6724eeca2743a5689b