Merge "Fix for SDK breakage with hidden field."