Merge "ECBM SystemProperty cleanup" am: fda88587c6 am: bc2dfb8946
am: dd0c10776d

Change-Id: I60644ce6e9dca1c6b4e4d92d18d4ec7fe00f778d