Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev