Merge "Reduce 'final' method churn when class is 'final'" am: a90e133bee
am: ef693fdf0a

Change-Id: I7cca934a6635153fa6deb6ad6057641d5e628205