Remove a couple of overrides same as default

Change-Id: I9e451c7799154f35a531b94732e8194e58792062