Merge "Remove native printing from test 980 and reliance on print internals" am: 9fdafe8fe4
am: 6822061aad

Change-Id: I5bbd8c5fc5bfdf837fc466364475942b3dd897d0