Fix deprecation

Change-Id: I017ce417cb584c16608744f4620b6bedfabdd12a