Merge "Remove redundant final modifiers from api" am: 0ac66edaea am: 42b86e3dec
am: ca8b6fdf1b  -s ours

Change-Id: I4bb87d7ab1c3b4d01c4d76ed42e06b338bba97a0