[automerger skipped] Merge Coral/Flame into AOSP master
am: 65c1ecb961 -s ours
am skip reason: change_id Idff1f3caff103926cd2cb267dab1d96bbb4daf33 with SHA1 ab8b1013a9 is in history

Change-Id: I1abd22c76dbdcbf7f5ff26c5b0489107e1249534