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

Change-Id: I835efd69c4369f784088d1d9123393e8a6fb853e