Remove remaining print statements

I think these are the last two stragglers, including debugging lines

Change-Id: Ic3dd98480211d0f7d3cc951bec5cd54f902a101f
Merge "Remove remaining print statements"