Improving TAPL diagnostics

Bug: 128531133
Change-Id: If81861afccb665e2dc2293f2704d99818b3297c8
11 files changed