[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
am: 6e2db2c34b  -s ours

Change-Id: I3e0340030a240a2e51209deeed0915ac62a1dcda