Merge "CEC: Explictly remove and add device when updating" into lmp-mr1-dev