Make grant default permission more robust.

Change-Id: If492ee3305774419671bbdb72b438c8e540005e9
3 files changed