Merge commit 'cc2465bbd5845fb128963f845589c8a6e41c64de' * commit 'cc2465bbd5845fb128963f845589c8a6e41c64de': Add final to appropriate variables.
Merge commit 'cc2465bbd5845fb128963f845589c8a6e41c64de' * commit 'cc2465bbd5845fb128963f845589c8a6e41c64de': Add final to appropriate variables.