Merge "Remove redundant final modifiers from api"
am: 0ac66edaea

Change-Id: I69d90dc2869943544e88ed01391d4a6b1107aa90