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

Change-Id: I2efab79eb983dae090de59d792ec875221d0fbec