Added extra tweaks to turbo-hipster.

Change-Id: I23b77f4a66f5bbd35a8d38d14404dbc44f1bf109