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

Change-Id: If8366b5803f9d063d7c8131272a398983e93fde6