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

* commit '82eeb2f20c934ddc97380032b3c8ecacc21d9a04':
  Take into account default app for default grants