Fix import grouping in scenario tests

This commit just fixes the grouping for imports in 2 scenario
test files. Previously they were incorrectly grouping the imports.

Change-Id: I27e37ce03299e878012cbc04f5224ed2681a2df7
Merge "Fix import grouping in scenario tests"