Merge changes I6d84d3d1,Idd304f56 into sc-dev

* changes:
  Revert enable exclusive in category atomic API
  Revert "Fix enable-exclusive atomic api"