Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev