Removed all the references to deprecated class

Bug: 28144767
Change-Id: If14752a81f6662fb33aacc04d54bfee249221d74
2 files changed