move function to base class and change function name
Change-Id: I4e872a4365f94196a18cc1625e2bdcdc74d54810