am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
automerge: ce3153d

* commit 'ce3153df56e4ed984b949869dd0ec97793f2c428':
  Fix NPE if FPE service does not exist.