This resolves unit test failure at speed 2, where the compound
motion search is short-cut.

Change-Id: I0b4d8e4eca4c1e76bab54cc0c106b64425712989