Change some more defaults

Change-Id: Ia80cbc67f85bd8577262c16ecc2c447962ff1db2
1 file changed