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

Change-Id: Ic5d300480551662d433151cb90f0109cd758ddad