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

Change-Id: Ib3dff4258f89e62821d7ad0ffbae398f3cd83a36