Fix PEP H301 (one import per line)

Change-Id: I7b0c991c869c903e60123ad5bdf876b06d83e3e9