Get rid of deprecated method usage

Change-Id: Iabc862dac48ac6182a8df6abe3d3f9fe6b50cc11
Merge "Get rid of deprecated method usage"