Merge "Grant default permissions if perms reset on upgrade." into mnc-dev