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

Change-Id: I02f471b151a705cfd9530129dc243e2057953983