Merge "fs_mgr:Add filter condition to make sure that the super block is...
Merge "fs_mgr:Add filter condition to make sure that the super block is correct." am: 9dd1a12b am: bc4c5032 am: 29a5cc17
am: 2eba1eb7
Change-Id: Iab8f87b34561b36ab9bf73fd1bb8662084717808