Merge "Update a few more uses of deprecated methods am: e21edc1041 am: 3ef7eb7c17" into oc-dr1-dev-plus-aosp