Fix system crash

Still testing, but I think this import is not needed

Change-Id: Ic7b564f353af1ac071878a24d3a749732e80c33a
\Merge branch 'Vanir' into HEAD