Merge "Take into account default app for default grants" am: 7abb36599d
am: 57fb4bd4f7

* commit '57fb4bd4f704c93ff73e055e6602ee18f7dbf669':
  Take into account default app for default grants