Adding system health diags for OOP tests
am: bd31868ea7

Change-Id: Ia339d74e04e4aa885fc965be9e23e57ab4618240