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

* commit 'c704bc647270c30b5c38d53d10228325befeb0b7':