Workaround for VE bug 51150

Change-Id: Ied103730bf8546127f32be88937402d2f6d2c990