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

Change-Id: I13aa416d04b267053954713bf3240eceda8d6dd5