Merge "fs_mgr: remove same partition check for vbmeta" am: 877e074eaf am: 8f901efbfc
am: 66ec0903fd

Change-Id: I7de175f210b5eed5aa1ca5bb31aee5af2cf36c46