Do not use deprecated method

Change-Id: I64e102731211d6837401b76745417b27a52a17e5
Merge "Do not use deprecated method"