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

Change-Id: Ib36e123b69da686f07833b85a4d80a6863c5675b