Using final wherever possible now.

Change-Id: I52bd7a3da87d19afaf5834e2a0a39ce80d0a7d7e