Merge "AIDEGen: Use 'import module' instead of 'import method' in Python"
am: 401c88fdc2

Change-Id: I055ef978724cade4ed0dad720145f23974034b94