Remove trailing comma and fix imports

Change-Id: I4dfe788df4f25677213bb07c4da93cc595c061f5