Merge "Start defining strongly-typed storage permissions."