Merge "fs_mgr:Add filter condition to make sure that the super block is correct." am: 9dd1a12b1e
am: bc4c5032fc

Change-Id: I8c0504873552f9f1cf1f1af44ed0e245172e22bf