Merge "ECBM SystemProperty cleanup"
am: fda88587c6

Change-Id: I71d56085bdf04d86e74c645068d1781645c7fd90