Merge "Put the right defaults for test lib."
am: 8f676995c0

Change-Id: Ib0558e54691294fa91a9a3fb3efd2c523870cb7a