Remove use of deprecated methods

Change-Id: Ifa04f4c3fc5295bb107a5d4b3a394727824e29ac
Merge "Remove use of deprecated methods"