fail merge fix

Change-Id: I7a47e96749836655bf075ff9cba93f9391703e32