[automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c -s ours
am: 119618a381 -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I6719833c4f030b7cf0d14dce49956ea3f8362c1a