[automerger skipped] Merge Coral/Flame into AOSP master
am: 18a6c77c5b -s ours
am skip reason: change_id Ibf1e116c34ddf69831cf83b9bdeafcc465a496cd with SHA1 055b8cd133 is in history

Change-Id: Id0bbdd7745bf1418f053e33c6833ee78abe43b6f