Merge "Take into account default app for default grants" am: 82eeb2f20c
am: 0c7e9262a1

* commit '0c7e9262a1cc89b748e281f330dd1ffecec6df3f':
  Take into account default app for default grants