Merge "AIDEGen: Fix unit test fail in ide_util_unittest.py"
am: ac728da965

Change-Id: I555737b87346d43384b519ee28890777e93fc512