Fixes breakage from HwAccelerationTest This reverts commit b2847afd. Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1