Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc83d25

Change-Id: I1fb2dbb0de98e3e2deadce25183aa37f2bc7c4ba