Merge remote-tracking branch 'aosp/upstream-master' into merge am: dd3cabeacc am: 6fbc3cf5a1 am: 13217871fe Change-Id: Icfe12d6db2f81a6f5c65241919b1d63fb665ffd6