Merge "ECBM SystemProperty cleanup"