am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"

* commit '5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862':
  Fixing services start order that impacts ICS - JB upgrade