Move final method to base class
am: 146c1e98ff

Change-Id: I33d398c5105fd3e598c1c8a65b2a078f4ee3f4bb