Bug 862742 - Fix lint and unit tests errors for sdcard import r=francisco.jordano