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

* commit 'f7db8e407b02a3cb2fe1e1e5838b1ebcb67f6dc5':
  Take into account default app for default grants