Merge "Fix various issues of getConnectionInfo" into oc-mr1-dev