Fix deprecation

Change-Id: I193d70cbabd58a289a5ac5083debb5fe3d80dc5f