Merge "Stop using deprecated methods. am: 20ee0bad10 am: 3157d03e59" into oc-dr1-dev-plus-aosp