Merge remote-tracking branch 'aosp/upstream-master' into HEAD
am: 9a79a752c7

Change-Id: I4a85b448f0ce18fcf941a164748e26ccbc84e40d