[automerger skipped] Merge Coral/Flame into AOSP master
am: 66e40defb5 -s ours
am skip reason: change_id I656b5a16e5aa945daed5a9a074c6d7e445517f27 with SHA1 3b67683604 is in history

Change-Id: I60cab4414c4f603d32430ded7a73943390471e8c