Merge "Fixes ordering of PrivacyType. Location at bottom."