Merge "Use non-deprecated methods."