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

Change-Id: I649fdad017618958e65f585494e9b7436fe2b057