Merge "Fixing nullPointerException is RotationHelper" into tm-qpr-dev