[automerger skipped] Merge Coral/Flame into AOSP master
am: ce737b0adc -s ours
am skip reason: change_id I8c0b927c51e4311f2cea578521ee708b8a81565b with SHA1 a2a3dbd4fd is in history

Change-Id: Ie4ce376a92229ed42c772ab8e8ec0cd4e1ebe842