Merge "Fix over-granting permission on low ram"