phpcs: The final declaration must precede the visibility declaration

Change-Id: I33d3bba8f02f1a3e568db4c482088cf006dcb8eb
Merge "phpcs: The final declaration must precede the visibility declaration"