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