Merge "ECBM SystemProperty cleanup" into oc-dev am: ad82cf6dbd
am: b7d7c93754

Change-Id: I63db54fef98096e891354a953fe39d69f42e6622