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

Change-Id: Iab8f87b34561b36ab9bf73fd1bb8662084717808