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

Change-Id: I851fbc817844f93b88ebe4aef7c52d7e3038da4a