cea720e793
This patch also re-organizes imports to import one per line. Change-Id: Ia958e3a30a48d4308d08d51df243c1272425c316 Fixes: bug 1188529 Fixes: bug 1188537