Merge "ECBM SystemProperty cleanup" into oc-dev am: efb8882b47
am: 21d8d8095e

Change-Id: I2e92b292366138f1e9b0d559ffec407b702d81ba