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