[automerger skipped] Merge Coral/Flame into AOSP master
am: 7152d04f36 -s ours
am skip reason: change_id Ia3ae894786c281feced2161142a69775838b9ad5 with SHA1 b3ee534556 is in history

Change-Id: Ia590e5a5cf470046b0d52191812cf623db71c490