Replace deprecated methog usages

Change-Id: I2cbfb2c7fea8253bf9aeb1a5fb4a87dbada7eb71