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

Change-Id: I452ba7025001f1e2e6bb741679c37a81a86e251e