[automerger skipped] Merge Coral/Flame into AOSP master
am: ac8873f6d0 -s ours
am skip reason: change_id I7b9859b578eb453fb0504b508a8e56d9ad3038d3 with SHA1 005dc0d5e8 is in history

Change-Id: I00b3d7d70a47564fb7742ba42df7a71630f33862