Remove usage of deprecated method

Change-Id: Ic1ccf2362001ed0ba23c90c16e10ae1374847385
Merge "Remove usage of deprecated method"