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

Change-Id: Ida45fae0bddbf0e8084aa3cdbb7bc99a1ac21650