4.2 temp hacks

Change-Id: I5cbbfb75f330a7ddef995fd966209a00ad9f1ef3