Merge "Revert "Take into account default app for default grants"" am: 9ae3aeec53
am: 0c4ce4474f

* commit '0c4ce4474ff0020b2b041f26fb00efbdc0783285':
  Revert "Take into account default app for default grants"