[automerger skipped] Merge Coral/Flame into AOSP master am: 3e72be4138 -s ours
am: 1c99836098 -s ours
am skip reason: change_id Ice305db6bf112cd9feeeec0eef3d783e964fd741 with SHA1 42b7bdc79b is in history

Change-Id: Ieaae0b57912d3e23360148196013ba92b0c15d36