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

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