Remove a few deprecation warning

Change-Id: Iefb19158acaae2f62699b89681bf576868276798