Merge "Tests: never use System.err" am: af8d813133 am: 2b288d23e2 am: c8cd4fb6b4
am: 034a87d3ac

Change-Id: I9e6138b0594e83c9dfe4b9953508527777e4893d