[automerger skipped] Merge Coral/Flame into AOSP master
am: bf590876fc -s ours
am skip reason: change_id Ic1a787f4f86e65fa80b0f3400339c90ab2600e03 with SHA1 3ba9e8bea6 is in history

Change-Id: I5055ae83c46361fc2a4a3bb873aee4ed51134c07