Set new defaults

Change-Id: Ie497b0c37c184163d106fbecac037230955fc9af