Merge "Make sure import script is consistent across OS revs"