[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am: 56cc4986df
-s ours
am: 0e05005d8d
-s ours
Change-Id: Ieb1b69c3fb1f42750044b49c270f4d533bbfb51b
This commit is contained in: