Merge "Revert "Put the right defaults for test lib.""
am: fe10f729ec

Change-Id: Id242adb2723c3dd2a0f54102851ce8679a459adc