Merge "AIDEGen: Causes device build to fail"