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

* commit '88cdc715c0795969be7f68d7363a0edfecebeea2':
  Revert "Take into account default app for default grants"