Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev