Merge "Revert "Minimal fix for ControlTest""
am: cd7c4f753d

Change-Id: Iba351ab2577b828e36520c3fed1e3849546222da