[automerger skipped] Merge Coral/Flame into AOSP master
am: 77918ad629 -s ours
am skip reason: change_id Ia3ddfe73a2fa32723e809f74bb83ff43d2c11df9 with SHA1 1d93206c5b is in history

Change-Id: Ia6c3bcbc8f4eda652cbbaa81d9a8e1521ac1efa2