Fix fallout from 461e0f9eaf9895ecd0eba67b35a4d2cec8a5e5c5

Change-Id: I9ed9c29c7a0a409ca38a71a2046c4b5be8caad17