Merge "Reduce 'final' method churn when class is 'final'" am: a90e133bee am: ef693fdf0a
am: f090f0b52b  -s ours

Change-Id: I408cce282046db44f3f161d6b0c8424f578ff6ef