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

Change-Id: I69e063bbb4c93f94d50c58a1c8af1643f5e024ca