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

Change-Id: I84223b5e0cb7bda24cc62377ed88b027b81169f8