[automerger skipped] Merge Coral/Flame into AOSP master
am: 78d137e9f8 -s ours
am skip reason: change_id Ie8e878868c681902616859fb280b2bd232b294f1 with SHA1 72325edad9 is in history

Change-Id: Ice2f4f0071fb080c65a170de0e7b237b8c10f2cb