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

Change-Id: I7e8d43ab2a4c1e735a4e855ce93212b20aa0e858