Improving TAPL diags
am: ce04131f1a

Change-Id: I0f5d881e67ce71f06bea9f1509277409b54a6956