[automerger skipped] Merge Coral/Flame into AOSP master
am: 7a14753de1 -s ours
am skip reason: change_id Ia60091c66d30357a172089407558b329e4a73ca0 with SHA1 0b02b693f7 is in history

Change-Id: I576fe2cd82c957cc4bfc0480653f4f296cf2ef6b