Fix-up for Ieebc69411

Change-Id: I353e6ce3fc11034bfec9ba66f6bc3798b92a1a4b