[automerger skipped] Merge Coral/Flame into AOSP master
am: 9886c4380e -s ours
am skip reason: change_id I9925cca0d3321c3daf7e63ce3916377734d4683d with SHA1 5b84d142a3 is in history

Change-Id: Ic9ac97667e5c1f7f2fa76e84029a693757bced64