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

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