Merge \"move system status checker config\" into nyc-dev
am: 956f8cb412

Change-Id: I3dfe3214ee36e1090dfdf3d9a7f01e792a6d0d7d