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

Change-Id: I2618ed5dca5f20a7087725e0d21370f6c3898bc0