Merge "DO NOT MERGE: Fix a couple of bugs in CEC services" into lmp-preview-dev