Merge "Minimal fix for ControlTest" am: ea9ba3fdbe
am: cba33d80aa

Change-Id: If0351cb1e082beed3fd3476b2004347654019101