Fix deprecation

Change-Id: Ifcce0142c09d340d9b0b4c09ff09311a3cd8a286