Merge "remove unneeded import" into jb-mr1-dev