Port import fixes from 2.7.
3 files changed