Fix pep H301  one import per line

Change-Id: Ie763743beb0219a6068f184113980122cb31fc83
Merge "Fix pep H301  one import per line"