Merge "ECBM SystemProperty cleanup" am: 4718606368
am: 40cde7b71f

Change-Id: I51ec750ff1833b1982d8fdc1995c1d8d29b36976