Avoid some deprecation warning

Change-Id: I5cebcada2c4498ab0b7c2ee33b2b1af33dc01802