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

Change-Id: I3faf57d4f51bbe5592405f377a44ed416af1c7b2