Remove final modifier from static methods

Change-Id: I93dd84874f46114011840ef840315a0d27c221ac
2 files changed