3442bc9467
And remove interim helper class. Bug:10674960 Change-Id: I81d31563074deea058b9bbb4b806c6200f85230f
And remove interim helper class. Bug:10674960 Change-Id: I81d31563074deea058b9bbb4b806c6200f85230f