Merge "Replace deprecated methods."