Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev