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

Change-Id: Ibc6a8076e695191f54423d9f72e075557ea80440