Merge "(CTS) Simplify service wrapper initialization + make robust" into pi-dev