Fixes bug #1013770 1. Reorder imports by full module path 2. Insert two blank lines after the last import Change-Id: I294ac3ab528f17a72811392d1732158e9487f3bf