Merge "CEC: Remove obsolete TODOs" into mnc-dev