Merge "Preparatory work to move Telecom to system service." into lmp-dev