[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am: 6e2db2c34b -s ours am: e89bf878c6 -s ours
am: 77e838e451 -s ours
Change-Id: Iba46b140281e73cfe82fd462622f6c7e983fdf4c
This commit is contained in: