Fix fallout from 6265876ae9f1bb862440182d2d2c9b9b5b322668

Change-Id: I62023c594d2cb2d4bf76459a9c1caaa5060c4b49