Merge "ECBM SystemProperty cleanup" into oc-dev