Add more test diags

Bug: 129434166
Change-Id: I1e2646e2e878eb3f7c93840937b33b2837aa31ac
2 files changed