Get rid of deprecated method

Change-Id: I07cac453b5bc6a3b6dffdda2ea95092b42f68f8c
Merge "Get rid of deprecated method"