[automerger skipped] Merge Coral/Flame into AOSP master
am: a09985228c -s ours
am skip reason: change_id I76f971e04ea413fc446867812ea6f542aaf824c0 with SHA1 1bef6736bd is in history

Change-Id: Ide144b7e9d3838c5275fa3689822f13018c61d2d