Fixes import reorder nits

Fixes bug #1133080

Change-Id: I31e56cea9b7310cfd16c0340ba270c4a777c200c
Merge "Fixes import reorder nits"