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

Change-Id: I22280ca066cafc304eda133647466dc4a188d270