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

* commit '66ce9698dc06662b4f3d5aece80f33d52efca53f':
  Take into account default app for default grants