get rid of deprecated method usage

Change-Id: I867ecb393b87546701544fd08af187b70f23134a