Get rid of unnecessary defaults

Change-Id: Ied1ed9c1965e5a3e1b72a2d91c578636d596247d
Merge "Get rid of unnecessary defaults"