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

Change-Id: I7153bb22bcf08a19b51612e3eccdac5f11b5a853