Fix "Make as default" (there was an Id clash)

Also add a bunch of @Overrides to show fewer warnings

Change-Id: I33e7a1d8ef7b52cf2a4542598617bd2d5bfcf0df
3 files changed