Merge remote-tracking branch 'aosp/upstream-master' into aosp am: c5e1fc00dd am: afdbff01ec

Change-Id: Ie3c5aa00ed5b586a60b20eebc23e38ff1d87ff44