Merge "fix clatd permissions try 3 - this time for GSI"