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

Change-Id: I38d01ca74abbffb62c4c64772e75f5d25fc90122