Remove check for f.isDirectory()
Merge "Remove check for f.isDirectory()" into kitkat-staging