Revert "Minimal fix for ControlTest"

This reverts commit d45e69ceec5cf523d771ac118b64d1b350418ae1.

Reason for revert: Broke ART bots

Change-Id: I5d487172d408e1d79b78bb7dabb69e263901a2f9
3 files changed