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

Change-Id: Ieaff582f38b43ce5ab2b8822c834f6008058324c