Fix import grouping

This is required for the follow-on H307 import grouping check.

Change-Id: I2581f192b20a2b05b49620ac9e80c9c6b3fefda1
Merge "Fix import grouping"