Merge "Add logic for when to start the Udfps fp service"