Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"