Merge changes from topic 'am-e618ad05-e675-4624-afd3-1d162a3b9cb2'
* changes:
[automerger] Update a few more uses of deprecated methods am: b2d11b91 am: 2d53f1ee
[automerger] Update a few more uses of deprecated methods am: b2d11b91
Update a few more uses of deprecated methods