Merge "Remove dual storage permission model"