Merge "Hotfix for gson test."