Fix-up for Iac35f2329

Change-Id: Ia7107a9652380bdd81fa5c1b8906c27f563d8510