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

Change-Id: I7e95ccc9ff851ebe322887fa3300b37966c42d37