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

Change-Id: Ie693f56e6a3aa9eea8a17565323fa965095cd10a