adding temporary hacks

Change-Id: I49a8b01e82c8480f46ee784e1e12218b4990ab43