Merge "Minimal fix for ControlTest (attempt 2)"
am: fbf7795cca

Change-Id: I9148c7c45152b991e37b4ba944df6ede09e75be4