Replace deprecated methods

Change-Id: I6196f30bb5a13c2e9082d590bfd89e42733784dd
Merge "Replace deprecated methods"