Merge "Fix capability checking for reject" into nyc-dev
am: ddad9e0dc5

* commit 'ddad9e0dc5671c51e0cb35151c84e0a26e5e092a':
  Fix capability checking for reject