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

* commit '99d607844da2b100afe3d134c1c006f4cc5b35b1':
  Fix issue with early service start