Fixed the usage of final in a few places, removing when redundant, adding where needed.

Change-Id: I138001a23edb5d847105493210d9f7df4e46c940