Merge "fs_mgr: fs_mgr_rm_all error propagation inconsequential EPERM" am: d2dfb33942
am: daa664a6a4

Change-Id: I0111393994f8768229d832634175d35fceccc759