[automerger] Update a few more uses of deprecated methods am: b2d11b9172

Change-Id: Iefd3cf58f24b439a6e06a3ab9646d88f8fb000ae