Merge pull request #4740 from sreecha/fix_import_issues

public_headers not found in some cases when running the script..