[automerger skipped] Merge Coral/Flame into AOSP master
am: 5de450023f -s ours
am skip reason: change_id I9fc77bfb2ee9c2a7567dc3645cf8cf436388e975 with SHA1 2a16dc6aa2 is in history

Change-Id: Iff98f3d1bcacbf30e11736bb293e784af91774d9