Fix fallout from 772c3a202481506b92c496948cfdc0f23ab94b2c

Change-Id: I0019ca081086544142b39aac5e6f00d5f1822ccb