Fix import ordering
Fix checkStyle warning
Merge branch 'master' into unstable_staging
Fix for checkStyle warning