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

Change-Id: I93cc7e75248ad474c315163551577fe4ada530fe