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

Change-Id: Ie91bfd71b106e86e1aedb6fbd2a121803f3cb381