Merge "Removing some deprecated methods" into rvc-dev am: 56242fa00d am: 5c33fab743

Change-Id: Ifaf67deb550babdc76d1173ba38e0f9a06ca6e1c