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

Change-Id: Iac8a9ad870134e984fedb441a674848a4503526a