Merge changes I0ad349f2,I0f528cf1

* changes:
  fs_mgr: allow using legacy A/B suffix
  fs_mgr: adapt to new A/B support