am 415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev

* commit '415e6f8ed46a70e6ae50e05cda56356dae31718c':
  Fix issue with early service start