Fix deprecation

Change-Id: I294a9d9bcc24ad53279192018d010525c7a61df5