Merge "ECBM SystemProperty cleanup"
am: 4718606368

Change-Id: Ie6b43fd0a0bfa7c813960d1bb53b7b57a4f82721