Merge "fs_mgr: fix userdebug/user argument type mismatch"
am: 1d0ee36de7

Change-Id: I436975b4394bb56d84ad02507ed0d9a59967cad0