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

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