Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev