[automerger skipped] Merge Coral/Flame into AOSP master
am: 16ec740024 -s ours
am skip reason: change_id Idf98a5af41c1436011f226631278afbc60290c2b with SHA1 77309054b2 is in history

Change-Id: Iaf3b4f390ed3c570ad17754c5315b06a78c79063