Merge "Don't reset cachedSize to 0 in getSerializedSize"