Merge remote-tracking branch 'aosp/upstream-master' am: 7a190cd28b am: ded265a0e0
am: 3eeee89ed1

Change-Id: I02fc83dce38939c82a0b8a9214d33d93aead2752