Merge "Bring privacy chip size up to spec" into sc-dev