am 20626284: (-s ours) Merge "DO NOT MERGE: Fix a couple of bugs in CEC services" into lmp-preview-dev

* commit '20626284d9d71abdbef9e8457325b32de9e5644a':
  DO NOT MERGE: Fix a couple of bugs in CEC services