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

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