[automerger skipped] Merge Coral/Flame into AOSP master
am: 13ca467371 -s ours
am skip reason: change_id I94e8a8cdab3c666e8c741dd03db5e6ffd477a4ca with SHA1 81c0c27570 is in history

Change-Id: Id765cbfcfeb7e5e5edf55f185cb351db20813068