Merge "Add none to supported fs type"
am: 789d905b50

Change-Id: I8d1cab2b9454bfb4657116d11dbedcc967718493