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

Change-Id: I113d7511c67a535ebc99cd0d446ec6b62a532787