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

Change-Id: Id88074ec1796242443a318af5fb5f1922b2370c7