Remove unneeded import_group lines which are not doing anything and just makes code harder to understand. Change-Id: I673dd04dd31ae9771e6af982d184eee0e9cbf2d4