Fix deprecation

Change-Id: I317ebfcb8f247fcfa0e496b1cd7d767ca7f5d2da