by removing some class which don't exist and adding some function which exist in current source. Change-Id: I1aa78db34051dd554bfdb81e9e24378cbf7f0ea3 Closes-Bugs: #1637930